From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 26 Apr 2013 13:17:11 +0000 (+0200)
Subject: shellDBus: Fix Eval() return value when disabled
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4277
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=39426f03e62d859f511448785516516d0f3e50c2;p=gnome-shell.git

shellDBus: Fix Eval() return value when disabled

Eval() is expected to return a boolean success value and a string result.
However when the function is disabled (via the development-tools setting),
we return null for the latter which is not a valid string value.
Return an empty string instead.

https://bugzilla.gnome.org/show_bug.cgi?id=698959
---

diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
index 727792c13..12e4b844b 100644
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -97,7 +97,7 @@ const GnomeShell = new Lang.Class({
      */
     Eval: function(code) {
         if (!global.settings.get_boolean('development-tools'))
-            return [false, null];
+            return [false, ''];
 
         let returnValue;
         let success;